scroll and layout improved