New Revamped button handling. Now works in fullscreen too!