Improvements to trip detail templates, string parsing, icons