layout fixes
merged