demo/snap: improve controls