Further improve UI