fix position issue
fix loading issue