Merge "added navbar in source-view component"