Finished up more of the settings pages