Buttons to menu
Arrows update