Tweak nav padding
Merge branches 'master' and 'dev' into dev
Fix nav arrow