layout fixes
more fixes