Fix bugs, add splash and add popup