Few display issues fixed