Proper scrolling and framing

  Please enter the commit message for your changes. Lines starting