Fixed loading message not being displayed
Disabled button while loading
Minor update