More fixes with layout