Border issues solved