Improve master view - add navbar [fixes #48238383]