More layout updates, tweak to help scrollableTestApp2, need to understand why these changes help.