remove click edit, better upload view, content manager integration