Undo layout changes for now