Trek detail design changes

Work on #48