Remove Action Menu, refactor menu action