Design stuff: Styles refactoring