Moved buttons into menu