No more simple nav.

It's not that hard to write that stuff ourselves. And it would be nice
to have more control over it. Also, fixed the collapse thing. Yay typos!

Change-Id: Iaa02245066e0df80b8b90b2760edcd7173d369dd