Fixes for layout.