Added ui modifications