Merged status bar and code cleanup branches.