Improved Content and Pages module.