Updated control layout