Added Status Bar, Refactoring