Improve master view. Add navigation bar. [fixes #48238383]