Slight updates to form structure