Improvements/bugfix on loading (code and UI)