More work on sample list, refactoring main page for greater flexibility