Start integrating bootstrap 3 + view changes