further improving UI