Changed layout
Merge fix