Refactoring preparation
Add styles