Fixed model and web related

Had to change model count: start, end because their name was in conflict
with another model. Updated the site to reflect new model
Merge branch 'master' into deploy