improved full form layout, cleanup date toggle options