additional bootstrap styling and slight logic changes