Fixed issues in which not including toolbar or display would cause errors