Some visual bugs fixed.