Some layout changes, and some work on scrolling, but that is proving to be an issue