applied more refactoring to reuse UI