Fixed custom buttons issue