Fixes issues Marty keeps throwing at us.
Switches User Panels, and puts estimated above actual effort.