** Clean up white spaces **
* Clean up white-space
* Change capture button to toggle button