Added base kinds for navigation and list views
Fixed indentions
Merge branch 'navigator'