Added changes to layout
Resolved merge conflict