Fixed Warnings in form and model, UI updated