More formatting on trainer page and a bit of caching