improved scrolling, design. added state restoration