Try to improve UI