Merge "Add the initial of the more options page with a toolbar has a return button"