few ui improvements