Added some more options/switched around the settings page