Starting to merge ui