completed the model, form and some fixes to view the views