fixing UI bugs