Further GUI enhancement