Restructure navbar items (cf. assets#8)

This MR doesn't solve the breakpoint problem in the navbar, but tidies it a bit up so the problem doesn't occur any more.

Depends on assets!16 (merged).