Cleanup, added navigation and set up semantic.
Finish code
Merge branch 'develop'