more fixes for layout