Small GUI improvements