Updated border in the right place now