Incorporate UI changes by @geosmiles inc. vertical scrollbar