Upload of version 2.1: Scrollbar issue fix and minor GUI updates