Merge changes to toolbar title and fixes