master: fixed menu on click, clean up completed