Fixed some border stuff