Minor re-organization
Minor UI tweaks