CSS cleanup, form a first support