Minor changes

Added restarting, cleaned up display