Added header icons and reordered the navigation