Rewrite blocks.less + minor form fixes