Simplified switching of nav, removed additional css and updated tests