Code cleanup
Added a statusbar