Tidied up navigation/header and togglelist