rearranged menu and completed quick location