Fixing loading state, updating button