adjusted 310
reverted buttons