Improve master_view - add navbar [Fixes #48238383]