Added more views for archive tabs, did some work in ArchiveController
fix merge conflict