Updating layout & refactoring style rules