Reindex, remove CLI orchestation, cherry-picked Tyler's and aglarendil's changes
minor content layout changes