Feature bootstrap template

merge andrew & mag re-styling