scrollbar fix; merge