CSS and layout changes, before block added and helpers rewritten