few minor mixes in layouts