some visual issues solved