Refactoring custom styles
Refactoring custom styles
border style