complete UI merge By View Wachiraya