Additional toolbar and nav bar improvements