Re: #1703 - implemented latest changes to layout and functionality - adding forgotten model class