Add gear to settings button, remove right spacer from settings screen