finish UI work and test