Updated layout forms