more work on markup, controllers, and added logo