Refactoring and relayout of setup config page
Fixing up setup
Merge branch 'desktop'