Add borders for now