Add code to remove border