More bootstrap and template file cleanup