Fix disk eject and macro delete. Fixes #517
Change add macro to add/edit macro