Re: #1703 - implemented latest changes to layout and functionality
Merge branch 'ticket-1703' into develop