Visuals

I have adapted the patch from issue 724 by alexghir9 following the
suggestion from Edvin