Improved text placement. Updated TapGestureDetector slightly.