Fixing GUI - seems ok now