Bootstrap templates for haml and minor code improvements