updated settings class name
put header options on one row
Fix click handler for settings-cog

Handler was using old class name.
Merge branch 'header-ui' into new-mobile-rough