Changes in Models

Models and JS issues