Fix display issues, close #6