Finished improvements to setting page