Small display bug fixed
Refactored