Hacked some fixes to layout