Form fixes and details