Fix few UI issues