Presentation, refactor stylesheet