Fixing a few visual bugs