Adding bootstrap to template + bugfixes