Added same modifications as master for top bar and 'Done' button in settings.