UI issues Fixed