cleaned up the code some more, more testing on android, android when scrolling horizontally does not adjust the content scroll correctly - need to fix