Fix loading bug. Computer Science Bitch!
Clean loading
Apdate Modal and Loading
Merge branch 'master' into f-feesRewrite