Fixing layout
Merge issues