done refactoring style (desktop only). next: mobile, which should be easy given the simplified structure