Fixed more visual bugs