Fixed some visual bugs