Control Screen Fixes