Completely rewrote display methods