Moved Locations, added Archive, added icons, general cleanups.