Archive in the menu and fixes.

Fixes #1497
Fixes #1524
Fixes #1527