Shorter section names and re-ordering