Updates to title and title bar
Resolve Conflicts