Upper right button fix