updated to reflect pull-request suggestions / renamed some GUI elements