Cleaned up the templates. Bootstrap contains too much custom stuff, still
Added support for titles