Fixes on html, and more models and stuff