Remving test navbar
Lots o' changes