Updated menu, moved files to fix menu fuctionality