Clean up of Settings
Lot of merge derps cause I rushed through. Settings crashes fixes for that come soon
Got to clean up settings a lot after mahdi moved a bunch of stuff

Signed-off-by: Chintan Shah <cgintan1998@gmail.com>