Adding nav icons and revising nav layout