Corrected buttons mapping