Fix few minor ui issues