Remove and restore Bootstrap to fix issues. Reformat layout template.
Merged changes.
Update main view