Revert spacebar and adjust constants