spaces removed
text transform uppercase removed from navigation
Merge branch 'develop'