Reorganized samples and menu