Added show/hide
Cleaned up display a bit