Try fixes to layout again