changed some button stuff (and menu)