Skip Button and other fixes