First part of CSS rework