Control Panel design improvement