Local changes plus merge conflict fixes and title bar fix to float the search box to the right