added border stuff