Fixed some UI issues according to client's requirements