Cleaned up Setting page UI to be a consistent
Essentially, I copied over some of the code from the main page so that we pretty much have the same kind of functionality in both places
Still haven't managed to track down what the cause of the flashing issue is.