Updated for patch 5.4, moved menu button