Improved content viewer. Added layouts.