Yakreader menu reorg

Task #3050