Improve user ui