Tidy up and new bootstrap theme