Update status bar and other nits