Screen & Control - more overhaul work