Few GUI improvements