Added two .ui forms to solve merging issues