Fixed navigation, helper method added for navigation links