Added panic button, minor bug fixes and changes