#330 Updated layout transistions