layout changes
layout changes, endpoints
Merge pull request #21 from paulhyunkim/tsangbranch

Layout fixes