redid the model and fixed spacing in the templates