Resolve Border Issues