Fixed the settings pages and a few other misc things