Improve titles markup