Fixing a UI issue