fixed couple display issues