Merge pull request #1 from klemmer/yu_xia

update repo to current running site
Merge pull request #2 from klemmer/yu_xia

current logistic page
fix laptop section bug