Fixed multiple bugs. Refactored display method