7.x 1.x dev

Changes towards css