case 3784 - Consider using views against hardcode.
case 3784 - Consider different displays for different situations.
Merge branch 'case-3784' into develop