Merging in status bar and tutorial changes.