refactored the display issue; still need to dry out