Bootstrap + templating

Some refactoring, bootstrap inclusion and more