Fixed warnings in layouts.  Main layout does not need ScrollView.  Still need to test.