#1521 - new layout