BON-14 : Added UI Form + investigation for next step