UI Improvements

Some basic improvements around UX mainly centered around bootstrap.


Will update model and test.