Fixes to cover controls, sizing between modes