Remove scrollable and add comments