GUI improvments and fixes - Alex