Add todo and potentially fix scrolling