Craig - add navs and skin nav tabs
Craig - merge