Moving scripts around, fixed CSS for blocks
Merge branch 'hotfix-1.1.8a' into live