Updated layout and unique validation