bug fix display issues