some visual issues fixed