Refactored some stuff and fixed a display bug