layout and toggle changes