fix transitions
fix scrolling
more layouting