Alternative solution to fix scrollbar issue and loading screen

Maybe this can be considered as a better solution.
For more info, see: #300