Refactor Menu actions