Layout and controls updates