Fixed buttons (13/18)

Fixed buttons