Tsting layout, depcrecated code fixed