added menu link and rearranged order