Fixed some issues for newer Android versions.  Added scrollview to layout.