Adding content viewer - not finished