fixing UI issues