fix issues
Fix loading...
Fix bugs & refactor