Implement reset/restart buttons
couple little fixes