R4: Menu and history additions & bug fixes