GUI Improvements + Refactoring package