Fixes for layout