Minor re-organization
Minor UI tweaks
Merge pull request #1 from licyeus/master

Some UI tweaks