Merge pull request #6 from delfrrr/layout-updates

Use mapbox hpp skel