Changes by jithu to improve UI.