changed the nav, cleanup and cosmetics