Added side / and full width view
Fixing merge errors with generated files.