Fixed border issue and updated skipper plugin