fixes for layouts