Improve UI layout