Switch to to a bootswatch theme
Fix template bug
Fix up some minor template issues