Fix the button issue at splash, fix some bugs