Added sidebar view and column layout
Fixed merge
Rendering in the right place