Add aliases and section about "Search"
Reorder sections