Merged archive menu changes from master branch