Refactoring, border radius and working layer