changed city show view if city page not activated
replaced magellan with regular unordered lists
commented out magellan, added color to subnav on hover and active
edited city show page to insert video
added styling
removed unnecessary lines from manifest
added layout.js as primary js file and required it in the manifest