Added bootstrap, and fixed some views