Cleaned up public views

-Removed commented out code
-Fixed top navigation links
-Removed contact from top menu as footer contains contact form
-Removed obsolete files