Merge "Initial work on new browser bar"