applying fixes for layout