Display work

Not done, but hopefully better. -From Chris