#160 layout fixes

let's merge