fixes for layout