Changed Nav Bar names to refelct pages, made icons consistent
Merge Activities page