Improved archive layout