Somewhat bigger update, merging new styles and bootstrap migration to version 3

Locally tested and merged, should be ok to merge.