Fixing UI stuffs