Add a skip button
Minor fixes