nav and footer modification, add and remove icons
merging conflicts fixed