Improvements, refactoring and UI adjustements