fixes to layout fixes