Update bootstrap.
Update view and controller
merge