More UI changes. Now onto chart-swapping...