Tidied up navigation/header and togglelist

I like that you've clearly marked this as a hack…  :)