Further GUI improvements