Still working on display issues