code clean up. pointer cursor all over the buttons