cleaned up button naming