#6: Fix display