Cleaned up code for settings, will get loading screen set up soon