Merge branch 'hotfix/navigation-bug'
Clear floats
Merge branch 'hotfix/navigation-links' into develop