Improve contentActions markup, fix columns, edit-bar in case it does not exist in content.