Refined the view.
Resolved merge conflict