Fix and improve help rendering