Merge branch 'hotfix/v1.2.4'
Fixed menu for smaller devices, consolidated css.
Merge branch 'hotfix/v1.2.5' into develop