Improve scrolling to newly added stuff
Improve layout