partly finished revising UI