Trek template improvments

Font size, missing spaces, colors, borders