work on UI + clean