#204 Improve titles