Code clean-up, fixed status bar.