Fixes to some of your model and HTML code