Fixed some usability issues during content editing