Fixed visual issues