Fixed scrollbar issue and loading screen (#298, #299)

Closing #298, #299