Minor updates for layouts