Fix issue with info window sometimes scrolling; move demo controls to right of map