Nav Tidy and Hover/Current Fix