#1763 finished UI validation and save to DB