added a navigation to the top for tablet and up and to the bottom for mobile. Also changed some styles
Fixed confilcts
Merge branch 'template-wrap'