UI changes. Refactored rounding corner code