update views and added bootstrap
after merge
fixing unmerges