JS tidied, nav-bar now cool