skip button + fixes