Removed smart border…Will replace with border option