add fixes to layout