Fix display bug and hopefully an issue with spaces