improved UI slightly