Changes for layouts