comment layout + composer update