Fixed issues in displaying