Slightly shortens current song bar
Merges in master
Fixes navbar
Merge branch 'master' into production