fix scrolling and add composer