Add Composer to table of contents and fix layout