rearranged menu
did some merging