now using bootstrap3 instead of bootstrap_toolkit, tidied up base.html too