fixing layout
merged
merged