Separate navigation bar from base

Separate navigation bar from base