More UI changes. Now onto chart-swapping...
Merge remote-tracking branch 'origin/mario'