Re-arrange Setup page
Merge pull request #9 from rhiever/patch-4

Re-arrange Setup page