Completed settings page

Tested & working. Merge pls.