Fixed some display issues and errors