Polish the settings menu, group things better and make them look better