Highlight current menu | preloader is now in a view | code cleanup