Content views fix and composer update