fixing display issues and paint issues