[WIP] Form fixes