cleaned up settings page, still needs work
Merge origin/master
fixed transfer page