Changed scrolling logic. Major layout updates