Added scrollbar, plus some clean up.