Update content block view template
Update panel edit animation and refactor layout
Merge branch 'master' of github.com:kreativkombinat/atx