Fix CP Content Page/Views

This fixes the issues in #1660 and #1889