Fix Build Items and improve forms