more layout changes
merged