Cleanup and fixing content_blocks save bug