Nav button, more gray icons and general ui changes