fixing UI