Added in menu entries and moved handlers out to menu.