Fixed issue with border generating X scroll