Consolidated the control panel for the 1st and 2nd screens, fixes #44.