Cleaned up the nav menu bit