Fix forms and make Build Item prettier