Changed display stuff to simpler approach