Edit couple visual issues