added navigation bar
Merge branch 'gem'