Bunch o' refactoring for the dashboard/cockpit