Updated layout of form