UI merge with the awesome