Unify top and bottom buttons
XSM API started