Fixed some visual issues