Fix: angle calculation, lost button