Updated FormLayout