some fixes to layout