Reorder activities (fixes #337), tweak search box text