Initial stab at cleaning up the workout ui