removed border
Merge branch 'hotfix/border'
Border2 fix
Merge branch 'hotfix/border2'